build: Set proper defaults for media backends

GTK supports webm playback, which means a backend should always be
compiled.

The ffmpeg backend however is incomplete (no audio) and as such, we
don't want people to end up with it accidentally.

Since we don't want to drag an entire gstreamer build into our ci
on MacOs or msvc, explicitly disable the gstreame media backend there.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c100755896dd20126c5ec9806cc44c7127976d88..8fddbcf2842f30de17a010f8e8ebff02b58bf19d 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -172,6 +172,7 @@ macos:
     - meson -Dx11-backend=false
             -Dbroadway-backend=true
             -Dmacos-backend=true
+            -Dmedia-gstreamer=disabled
             -Dintrospection=disabled
             -Dcpp_std=c++11
             -Dpixman:tests=disabled

diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index 294e9480df93db495198dfc531837e0042063308..c6833f0c0e30f6f747e22292157e02788d7143b9 100644 (file)
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -6,7 +6,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar
 
 :: FIXME: make warnings fatal
 pip3 install --upgrade --user meson==0.56.2  || goto :error
-meson _build || goto :error
+meson -Dmedia-gstreamer=disabled _build || goto :error
 ninja -C _build || goto :error
 
 goto :EOF

diff --git a/meson_options.txt b/meson_options.txt
index 402caec5fbd3f41d0fc19bffe421f34f3e2e7897..2223cb79646ee16773754bd788831954e535a976 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -26,15 +26,17 @@ option('macos-backend',
        description : 'Enable the macOS gdk backend (only when building on macOS)')
 
 # Media backends
+# For distros: GTK guarantees support for WebM video (VP8 and VP9), so a supported build
+# should provide that.
 
 option('media-ffmpeg',
        type: 'feature',
-       value: 'auto',
-       description : 'Build the ffmpeg media backend')
+       value: 'disabled',
+       description : 'Build the experimental ffmpeg media backend')
 
 option('media-gstreamer',
        type: 'feature',
-       value: 'auto',
+       value: 'enabled',
        description : 'Build the gstreamer media backend')
 
 # Print backends